From 026917f56ac6547d561c293cf4d7698f93ca3891 Mon Sep 17 00:00:00 2001
From: Andrew Innes <andrewi@gnu.org>
Date: Thu, 7 Dec 2000 10:41:05 +0000
Subject: [PATCH] (xlfd_charset_of_font): Fix last change.

---
 src/w32fns.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/w32fns.c b/src/w32fns.c
index 50c86d5e944..b65be25262f 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5462,9 +5462,11 @@ char * xlfd_charset_of_font (char * fontname)
   if (!encoding || encoding == fontname)
     return NULL;
 
-  charset = strrchr(encoding - 1, '-');
+  for (charset = encoding - 1; charset >= fontname; charset--)
+    if (*charset == '-')
+      break;
 
-  if (!charset || strcmp(charset, "-*-*") == 0)
+  if (charset == fontname || strcmp(charset, "-*-*") == 0)
     return NULL;
 
   return charset + 1;
-- 
2.30.2